Auto merge of #1397 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 9 Mar 2015 20:51:30 +0000 (20:51 +0000)
committerbors <bors@rust-lang.org>
Mon, 9 Mar 2015 20:51:30 +0000 (20:51 +0000)
commit202131f5654f31e0c85d5c6ff4d1f7dd7b8505d0
tree7a39c014aac386881ed198bbedaaec97f5638b50
parentb27cd4706063510640410540c1e68da3a294ab24
parent22e7ede6c885e30a8c083dfe2cb76fffe42f9fb7
Auto merge of #1397 - alexcrichton:update, r=alexcrichton

Continuation of #1384